Service Portal, Git, checksum.txt
- Mark as New
- Bookmark
- Subscribe
- Mute
- Subscribe to RSS Feed
- Permalink
- Report Inappropriate Content
‎03-15-2017 03:56 PM
When trying to merge two branches, the only conflict that comes up is the "checksum.txt" file.
Do we need to set up our instances so that the checksums match? Can I choose one of the conflicting checksums arbitrarily?
Unsure how to proceed with these kinds of conflicts beyond checking out one of the branches and applying the updates again.
- Mark as New
- Bookmark
- Subscribe
- Mute
- Subscribe to RSS Feed
- Permalink
- Report Inappropriate Content
‎04-03-2018 02:54 PM
Please see attached!
- Mark as New
- Bookmark
- Subscribe
- Mute
- Subscribe to RSS Feed
- Permalink
- Report Inappropriate Content
‎01-21-2022 10:22 AM
I simply let the changes coming from the main branch to override the feature branch (override the checksum in feature branch). Example: if I am working on a branch feature/aaa and my deployment branch name is release-branch. I make a pull request from release-branch to feature/aaa and if the only conflict is the checksum.txt, I resolve the conflict by accepting the incoming change from release branch. I hope this helps.
