Closed Burgch closed 11 years ago
Git is designed to handle this a bit more elegantly: I would suggest operating in a branch called "conor" (I operate in one called "gideon"), committing for every change you make (as is Git best practice) and merging when done.
Oh yeah, I know, I've seen you using Gideon, but I cba to make a branch when it's one commit from being done :)
Conor
On 13 Apr 2013, at 20:26, Gideon Farrell notifications@github.com wrote:
Git is designed to handle this a bit more elegantly: I would suggest operating in a branch called "conor" (I operate in one called "gideon"), committing for every change you make (as is Git best practice) and merging when done.
— Reply to this email directly or view it on GitHub.
Well yes, but in general.
Committing for every small change means the entire history of a file is transparent (and logged for when you need to work out why you did something). Some workflows advocate committing for every line you edit, but I don't agree with that.
On Saturday, 13 April 2013 at 20:29, Conor Burgess wrote:
Oh yeah, I know, I've seen you using Gideon, but I cba to make a branch when it's one commit from being done :)
Conor
On 13 Apr 2013, at 20:26, Gideon Farrell <notifications@github.com (mailto:notifications@github.com)> wrote:
Git is designed to handle this a bit more elegantly: I would suggest operating in a branch called "conor" (I operate in one called "gideon"), committing for every change you make (as is Git best practice) and merging when done.
—
Reply to this email directly or view it on GitHub.— Reply to this email directly or view it on GitHub (https://github.com/KCSU/website-theme/issues/16#issuecomment-16339212).
Yeah, I normally commit locally and then push 4 or 5 commits at once to remote.
On 13 Apr 2013, at 20:31, Gideon Farrell wrote:
Well yes, but in general.
Committing for every small change means the entire history of a file is transparent (and logged for when you need to work out why you did something). Some workflows advocate committing for every line you edit, but I don't agree with that.
On Saturday, 13 April 2013 at 20:29, Conor Burgess wrote:
Oh yeah, I know, I've seen you using Gideon, but I cba to make a branch when it's one commit from being done :)
Conor
On 13 Apr 2013, at 20:26, Gideon Farrell <notifications@github.com (mailto:notifications@github.com)> wrote:
Git is designed to handle this a bit more elegantly: I would suggest operating in a branch called "conor" (I operate in one called "gideon"), committing for every change you make (as is Git best practice) and merging when done.
— Reply to this email directly or view it on GitHub.
— Reply to this email directly or view it on GitHub (https://github.com/KCSU/website-theme/issues/16#issuecomment-16339212).
— Reply to this email directly or view it on GitHub.
All done :)
Also please don't change single-event.php or front-page.php just yet, making some major changes to the logic.