Importance of diffing and merging for design specifications documentation
The context of this question is choosing tools for writing design specifications for software projects.
Importance of diffing and merging for design specifications documentation
The context of this question is choosing tools for writing design specifications for software projects.
What’s the appropriate procedure for subversion merges? [duplicate]
This question already has answers here: How can I avoid editing conflicts repeatedly when merging from one to branch to another? (2 answers) Closed 10 years ago. We have a project with a few release branches and a trunk. Lately we’ve been adding bugfixes and new features to the release branch, while doing simultaneous infrastructure […]
What’s the appropriate procedure for subversion merges? [duplicate]
This question already has answers here: How can I avoid editing conflicts repeatedly when merging from one to branch to another? (2 answers) Closed 10 years ago. We have a project with a few release branches and a trunk. Lately we’ve been adding bugfixes and new features to the release branch, while doing simultaneous infrastructure […]
Merging branches where the same code was worked on
If there are two unrelated tasks, except that the changes are in the same project, and end up touching at least one of the same classes/methods, how do I manage that?
Branching strategy for frequent releases [duplicate]
This question already has answers here: Stopping developers committing to the wrong branch on DVCS (4 answers) Closed 9 years ago. We have very frequent releases and we use Git for version control. When i am mentioning about frequency, please assume it to include bug-fixes and feature release too. All releases are eventually merged into […]
How do I review code changes that are the result of syncing?
At my current job we develop code on a release branch and then do a code review. After all rework is done the final changes are also synced/merged to the ‘main branch’. We want to be sure that all changes are synced correctly. What’s a good way to review this sync work?
Merging very big branch with master [duplicate]
This question already has answers here: What can I do to let our team have code reviews of branch merges having hundreds of screens worth of Github diffs? (3 answers) Closed 9 years ago. I have rather big git branch with code that was created on may of this year and never before was merged […]
How to avoid old commits/PRs that are painful to merge?
We have a pretty good code review process, but there are couple of issues. The most annoying problem is merging. From time to time the number of stuff to merge grows rapidly and some of the commits are getting old. As a result, rebasing is a pain (conflicts).
One commit in two branches: what happened?
I work on a project using maven and svn.