Menu
For example:
Is it safe to repeat the process with another branch named refactor?
661
You can always reuse that branch if you'd like or remove it.
What Happens If I Delete a Git Branch? When you delete a branch in Git, you don't delete the commits themselves. That's right: The commits are still there, and you might be able to recover them.
So you should feel perfectly safe deleting the branch after the merge. One more thing you could do though, is once the hotfix is merged, create a tag on the master branch identifying that point as the hotfix release.
With SVN the only problem you might run into is that when merging the mergeinfo property of the merge point (folder or file depending on the level where the merge was made) will contain the branch name and revision numbers of previous merges. I don't think that SVN actually uses this information when merging, but it becomes confusing sometimes as a user.
If you don't care about this then it should work fine ... but I know in previous projects we used mergeinfo as an indication of what branches we had merged back into trunk, so re-using a branch name would be dangerous.
53
Yes, you can do this, as long as you're not confused about which refactor is which when you look at the Subversion log history.
Assuming you have some sort of trouble ticket system, it would be better to tie particular revisions to the trouble ticket that caused the revision to be made, either by number or code.
29
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With
