Discussions tagged Merge
Rearanged source code and Git merge conflicts
- Last updated 6 months ago
- Armeen Mazda @Appeon replied 6 months ago
Hello, at our company we are currently in the process of migrating our relativly big PowerBuilder project to Git.So far that has worked fairly well, but we have encountered an issue where it would be interesting to know how this was ment to work and...
Format of PBT causes Merge Conflicts on new PBLs
- Last updated 3 years ago
- Roland Smith replied 3 years ago
Hello We've been using PB 2019 and GIT (BitBucket Server) now for some time, and with some custom scripting (a refresh-all.ps1 that uses PBC to rebuild PBLs from source) its all working rather smoothly. However, I noticed that there is a problem wi...
- Page :