LoginSignup
0
0

More than 5 years have passed since last update.

@dawn_628

GitHubのコンフリクト　※自分用メモ

Last updated at Posted at 2016-08-30

GitHubコンフリクト(一番簡単)
1.該当のリポジトリ(issue-1とか)でgit pull origin master(develop)
2.HEADと他を削除する。’’’’ ‘’' は残す？
3.git add .
4.git commit -m “update_text"
5.git push origin issue-1
※コケたら -f OK？

reverse
コミットが綺麗になる。
http://www.karakaram.com/git-rebase-i-usage

0
0
0

Register as a new user and use Qiita more conveniently

  1. You get articles that match your needs
  2. You can efficiently read back useful information
  3. You can use dark theme
What you can do with signing up
Sign upLogin
0
0