search

OpenDataServices / developer-docs

Documentation about how we get our work done. For internal use, but happy to share
Other
1 stars 0 forks source link

Should we be telling people to use temporary branches and git amend? #61

Open odscjames opened 6 years ago

odscjames commented 6 years ago

https://github.com/OpenDataServices/developer-docs/blob/master/tools/git.md#temporary-branches

In general having temporary commits on temporary branches is better than using git stash. ... they can also be pushed to the server. .... If you have a temporary commit you can update it using git commit --amend -a --date="date``

If you push to a remote, git amend and then try and push again that's not great? Maybe take advice out about commit --amend?

(Also maybe tell people to delete temporary branches from GitHub when done?)

BibianaC commented 6 years ago

Temporary branches with temporary commits, does this mean to always work in branches instead of master? +1 on deleting them once done.

odscjames commented 6 years ago

Yes, the first section of https://github.com/OpenDataServices/developer-docs/blob/master/tools/git.md specifies feature branches. (Actually it specifies "most", we should maybe clarify that later!)

BibianaC commented 6 years ago

It would be good to clarify this 'must'. Specify what is allowed not to be in a branch.