Best Branching and Merging strategies in git

Step 1 – First you need to learn the needs of branches. This is very good read.

• https://docs.microsoft.com/en-us/vsts/repos/tfvc/branching-strategies-with-tfvc?view=vsts

Step 2 – Now time has come to Learn best branching model in Git.

• https://buddy.works/blog/5-types-of-git-workflows
• https://hackernoon.com/a-branching-and-releasing-strategy-that-fits-github-flow-be1b6c48eca2
• https://nvie.com/posts/a-successful-git-branching-model/

Step 3 – Now, Lets understand, what is the kind of merges we have in Git?

• https://www.atlassian.com/git/tutorials/using-branches/git-merge
• https://git-scm.com/docs/merge-strategies
• https://stackoverflow.com/questions/366860/when-would-you-use-the-different-git-merge-strategies

Step 4 – Are you still having a questions, Please post in the comment section.

The post Best Branching and Merging strategies in git appeared first on scmGalaxy.

-Saritha

The post Rename the Branch name appeared first on scmGalaxy.

I’m integrating code between 2 codelines using p4 integrate.

Following p4 integrate/resolve -n /resolve -as/submit steps

the target line looks as expected.

However, I have a bunch of files remaining in the default changelist.

‘p4 opened’ lists theses files as ‘……branch default change…’ open files.

Also when I look in the depot I see cooresponding entries there as
‘ The file is open for branch in the default changelist ‘ with the file branch logo.

Is there a way of ‘clearing’ the default changelist?

Its as if the integration is nearly complete, but the changes are getting reopened in the default changelist. And the depot is reflecting this.

The only way I know to remove an opened file is to revert it, but will a revert on these file, undo the integrate?

Thanks

rajeshkumar replied the topic: Re: Files opened for branch in default changelist
If the integration has been submitted, then ‘p4 revert’ will only revert the pending changes in your workspace. To get a better understanding of the situation please run the following commands from the workspace experiencing this behaviour and send me the full output:
p4 -Ztag info
p4 opened
p4 client -o
Regards,
Rajesh Kumar
Twitt me @ twitter.com/RajeshKumarIn

The post Files opened for branch in default changelist appeared first on scmGalaxy.

Branching and Merging Practices

The post Branching and Merging Best Practices | Branching and Merging Guide appeared first on scmGalaxy.