What I want to know is can I use the experimental branch like I use my working copy, just add changes to it as I go along?
Here's a scenario; say I do a change A in response to a user query but I don't commit it to the master because it's minor. Then a while later I add change B in response to another query which I also don't commit. Then sometime later I'm working on change K and it's proving to be tricky but people are requesting that I commit changes from J. Assuming I've been saving the changes to the experimental channel, can I go back to J and commit (or push) that to the master then return to K and continue working on it?
What I'm trying to say is if you branch the experimental version at point A of the master, isn't the experimental branch essentially what is at A plus any changes made in the experimental branch?
If you push the changes in the experimental branch to the master at point B then at that point aren't the experimental and master branches the same?
From then on can't the experimental branch now be considered a change from point B in the master?
rock5 wrote:So the fact that the blue branch does have B and C doesn't cause it too loose any changes from B and C. I guess this is a situation where you could get a conflict if D changes the same parts as B or C.
you use Github Desktop, right?
And you said you prefer to use the web site to do merges?
Users browsing this forum: No registered users and 1 guest