search

SUNY-Albany-CCI-INF362 / whatev3r

Team Whatev3r's Project
http://SUNY-Albany-CCI-INF362.github.io/whatev3r/
Other
0 stars 6 forks source link

Writing over our own changes #134

Closed everett-f closed 10 years ago

everett-f commented 10 years ago

I don't understand how to use github so we aren't writing over our each others' work.

  1. First I Sync the online master branch to my local master branch
  2. I made a new branch(timeline_edits_mobile) off of master, then publish
  3. I make whatever changes to my local branch(timeline_edits_mobile)
  4. I "up" sync my changes to my online branch (timeline_edits_mobile)
  5. I merge my branch into master(base)
  6. I merge master into ghpages(base)

@kullah 's most recent merge request has gotten rid of a few things needed for timeline to work properly. I think he works directly off of his local master branch. But I still don't see why that would mess my work up.

My work is still in my branch but I want to figure out how to update master without compromising other people's work. How can I do this? @esteinborn @roshinc @Rafaelflores92

esteinborn commented 10 years ago

You ALL need to be working off features branches. That is the whole problem. Master trumps all.

What happens is this. You make your change put it into master, master is updated, someone else has a copy of master, they update it and it will overwrite because GH thinks its newer.

You'll need to re-merge your stuff into master again. and EVERYONE needs to be working on their own feature branch off of master. If you need help, you can see my video series I made for you on youtube: https://www.youtube.com/watch?v=PmsD0aaSwPc and https://www.youtube.com/watch?v=t8H5-9e2j64

everett-f commented 10 years ago

@Quanda @km441193 @km441193

everett-f commented 10 years ago

Thanks we'll try this again @esteinborn

esteinborn commented 10 years ago

Worst case, we fix it Monday.

On Friday, April 18, 2014, extremezoo notifications@github.com wrote:

Thanks we'll try this again @esteinborn https://github.com/esteinborn

— Reply to this email directly or view it on GitHubhttps://github.com/SUNY-Albany-CCI-INF362/whatev3r/issues/134#issuecomment-40820395 .

roshinc commented 10 years ago

@extremezoo which is the pull request that has what u want #137 or #136

everett-f commented 10 years ago

@roshinc I'll get rid of both of those. I had to manually add the files that were removed back into master and synced it. My timeline works and I see the changes that @Rafaelflores92 and @kullah have made. Man this was annoying and I never want to do that again. Can everyone please make branches to merge into master instead of using master itself.

esteinborn commented 10 years ago

We'll discuss this in tonights class.