FredrikNoren / ungit

The easiest way to use git. On any platform. Anywhere.
MIT License
10.44k stars 637 forks source link

Getting changes while new branch from origin before git pull #1150

Open ricson5499 opened 5 years ago

ricson5499 commented 5 years ago

I thought even no need git pull or checkout the origin/master on ungit, i directly click on the origin/master branch and click on "+" to new branch, and it will use the lastest version, but actually is not.

Even the ungit only have my last changes when i check on the difference, but after push and doing pull request i realize the changes still using the local, not the origin one

Should we do alert to pull this branch first or give some setting option while people clicking on the new branch button? If not the ungit will show incorrect information on GUI.

//something like this if(button plus clicked && isOrigin && local branch is behind 'origin){ prompt("update your local branch?") if(yes){ git pull "branchname", git checkout "new branch" refer from origin }else{ msg either not allow to create branch before pull or warning the information will be different. } }

jung-kim commented 5 years ago

I'm having very hard time following what is being described here.

Are you suggesting that when you add new branch via + you expect that branch to be created at the latest of that branches' git lineage?

+ as is right now create a new branch at the location of the git tag you clicked on.

ricson5499 commented 5 years ago

Hi,

πŸ™‚ thx for ur reply. Let me explain to u.

master

That sound incorrect coz i didn do git pull to merge my branch. If using command prompt, we wont' forgot to fetch and then pull to merge the branch.

But if that really happen, the ungit still giving me to push to origin without warning, until i check on amazon aws console while doing pull request, i realize the different which i need to merge has been changed. From other user.

I rmb if there have the changes on the same branch, ungit will give warning to us and stop the push, after that we can just fetch and merge then can push our branch.

But this round ungit doesn giv warning, that may a bit quite dangerous.

jk-kim notifications@github.com 于2018εΉ΄10月28ζ—₯周ζ—₯ 上午1:43ε†™ι“οΌš

I'm having very hard time following what is being described here.

Are you suggesting that when you add new branch via + you expect that branch to be created at the latest of that branches' git lineage?

  • as is right now create a new branch at the location of the git tag you clicked on.

β€” You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub https://github.com/FredrikNoren/ungit/issues/1150#issuecomment-433640812, or mute the thread https://github.com/notifications/unsubscribe-auth/ALTSzb6ZIpYk20Mfd4YMQJ2-Fjl8lN8Fks5upJtAgaJpZM4X5qV- .