Questions tagged [merge]

The tag has no usage guidance.

Filter by
Sorted by
Tagged with
13 votes
2 answers

Pull request merge process requiring rebase after every commit merged into master?

I'm working in a codebase at work that requires that anyone who wants to merge a PR rebase against the last master prior to merging the pull request. To further complicate things, CI (which takes ...
roulette01's user avatar
0 votes
2 answers

Is a 'base' file always necessary when doing a merge?

Are there any algorithms that can do or suggest merges without requiring the "base" file, the most recent common ancestor of the two file versions that we want to merge? Is a manual merge ...
yoyo_fun's user avatar
  • 2,297