ICode9

精准搜索请尝试: 精确搜索
首页 > 其他分享> 文章详细

IDE集成GIT

2022-06-25 22:32:01  阅读:120  来源: 互联网

标签:集成 main GIT java create mode 100644 IDE com


IDER集成GIT

 

创建ider项目文件到和git克隆文件同一目录下

将git里的文件赋值到ider项目文件里

我这是第二次add就是这样子,第一次的话,会有很多东西的

 

提交到暂存区,我只截取了一小部分,这个太多

 

 

 你可以指定添加到哪个分支里面

 

 


 create mode 100644 src/main/java/com/dayu/rongqi.java create mode 100644 src/main/java/com/dayu/wu.java create mode 100644 src/main/java/com/dayu/wula.java create mode 100644 src/main/java/com/ershiti/demo1/Student.java create mode 100644 src/main/java/com/erti/Demo3/demo13.java create mode 100644 src/main/java/com/erti/Demo3/demo13Test.java create mode 100644 src/main/java/com/erti/demo1/Person.java create mode 100644 src/main/java/com/erti/demo1/Student.java create mode 100644 src/main/java/com/erti/demo10/MyArray.java create mode 100644 src/main/java/com/erti/demo10/Test.java create mode 100644 src/main/java/com/erti/demo5/test.java create mode 100644 src/main/java/com/erti/demo5/yi.java create mode 100644 src/main/java/com/erti/demo6.java create mode 100644 src/main/java/com/erti/demo8/Compute.java create mode 100644 src/main/java/com/erti/demo8/Student.java create mode 100644 src/main/java/com/erti/demo8/Test.java create mode 100644 src/main/java/com/erti/demo9/Dic.java create mode 100644 src/main/java/com/erti/demo9/DicItem.java create mode 100644 src/main/java/com/erti/demo9/Test.java create mode 100644 src/main/java/com/shiti/demo1/A.java create mode 100644 src/main/java/com/shiti/demo1/Animal.java create mode 100644 src/main/java/com/shiti/demo1/Bird.java create mode 100644 src/main/java/com/shiti/demo1/test.java create mode 100644 src/main/java/com/shiti/demo10/Cat.java create mode 100644 src/main/java/com/shiti/demo10/Dog.java create mode 100644 src/main/java/com/shiti/demo10/test.java create mode 100644 src/main/java/com/shiti/demo2/Animal.java create mode 100644 src/main/java/com/shiti/demo2/Cat.java create mode 100644 src/main/java/com/shiti/demo2/Dog.java create mode 100644 src/main/java/com/shiti/demo2/test.java create mode 100644 src/main/java/com/shiti/demo3/Computer.java create mode 100644 src/main/java/com/shiti/demo3/Flash.java create mode 100644 src/main/java/com/shiti/demo3/Print.java create mode 100644 src/main/java/com/shiti/demo3/USB.java create mode 100644 src/main/java/com/shiti/demo3/test.java create mode 100644 src/main/java/com/shiti/demo4/Car.java create mode 100644 src/main/java/com/shiti/demo4/SportsCar.java create mode 100644 src/main/java/com/shiti/demo4/test.java create mode 100644 src/main/java/com/shiti/demo5/Flower.java create mode 100644 src/main/java/com/shiti/demo5/test.java create mode 100644 src/main/java/com/shiti/demo6/Person.java create mode 100644 src/main/java/com/shiti/demo7/Phone.java create mode 100644 src/main/java/com/shiti/demo8/Girlfriend.java create mode 100644 src/main/java/com/shiti/demo9/Coder.java create mode 100644 src/main/java/com/shiti/demo9/Manager.java create mode 100644 src/main/java/com/shiti/demo9/test.java create mode 100644 src/main/java/com/ti/demo1.java create mode 100644 src/main/java/com/ti/demo10.java create mode 100644 src/main/java/com/ti/demo2.java create mode 100644 src/main/java/com/ti/demo3.java create mode 100644 src/main/java/com/ti/demo4.java create mode 100644 src/main/java/com/ti/demo5/Keeper.java create mode 100644 src/main/java/com/ti/demo5/Manager.java create mode 100644 src/main/java/com/ti/demo5/Trainer.java create mode 100644 src/main/java/com/ti/demo5/test.java create mode 100644 src/main/java/com/ti/demo6/Animal.java create mode 100644 src/main/java/com/ti/demo6/AnimalTest.java create mode 100644 src/main/java/com/ti/demo6/Cat.java create mode 100644 src/main/java/com/ti/demo7.java create mode 100644 src/main/java/com/ti/demo8.java create mode 100644 src/main/java/com/ti/demo9.java create mode 100644 target/classes/META-INF/dayu.kotlin_module
D:\git\GIT_TEST\dayu>git pushTo https://gitee.com/yuzong_1/wula.git ! [rejected]        master -> master (fetch first)error: failed to push some refs to 'https://gitee.com/yuzong_1/wula.git'hint: Updates were rejected because the remote contains work that you dohint: not have locally. This is usually caused by another repository pushinghint: to the same ref. You may want to first integrate the remote changeshint: (e.g., 'git pull ...') before pushing again.hint: See the 'Note about fast-forwards' in 'git push --help' for details.
D:\git\GIT_TEST\dayu>git push -u origin masterTo https://gitee.com/yuzong_1/wula.git ! [rejected]        master -> master (fetch first)error: failed to push some refs to 'https://gitee.com/yuzong_1/wula.git'hint: Updates were rejected because the remote contains work that you dohint: not have locally. This is usually caused by another repository pushinghint: to the same ref. You may want to first integrate the remote changeshint: (e.g., 'git pull ...') before pushing again.hint: See the 'Note about fast-forwards' in 'git push --help' for details.
D:\git\GIT_TEST\dayu>git pull --rebase origin masterremote: Enumerating objects: 165, done.remote: Counting objects: 100% (165/165), done.remote: Compressing objects: 100% (87/87), done.Receiving objects: 100% (164/164), 30.21 KiB | 672.00 KiB/s, done.

From https://gitee.com/yuzong_1/wula * branch            master     -> FETCH_HEAD   8befbdd..840d11c  master     -> origin/masterAuto-merging .idea/compiler.xmlCONFLICT (add/add): Merge conflict in .idea/compiler.xmlAuto-merging .idea/misc.xmlCONFLICT (add/add): Merge conflict in .idea/misc.xmlAuto-merging .idea/vcs.xmlCONFLICT (add/add): Merge conflict in .idea/vcs.xmlAuto-merging pom.xmlCONFLICT (add/add): Merge conflict in pom.xmlerror: could not apply 8697b20... 大余提交hint: Resolve all conflicts manually, mark them as resolved withhint: "git add/rm <conflicted_files>", then run "git rebase --continue".hint: You can instead skip this commit: run "git rebase --skip".hint: To abort and get back to the state before "git rebase", run "git rebase --abort".Could not apply 8697b20... 大余提交
D:\git\GIT_TEST\dayu>git push -u origin masterTo https://gitee.com/yuzong_1/wula.git ! [rejected]        master -> master (non-fast-forward)error: failed to push some refs to 'https://gitee.com/yuzong_1/wula.git'hint: Updates were rejected because a pushed branch tip is behind its remotehint: counterpart. Check out this branch and integrate the remote changeshint: (e.g. 'git pull ...') before pushing again.hint: See the 'Note about fast-forwards' in 'git push --help' for details.
D:\git\GIT_TEST\dayu>git pushfatal: You are not currently on a branch.To push the history leading to the current (detached HEAD)state now, use
    git push origin HEAD:<name-of-remote-branch>

D:\git\GIT_TEST\dayu>git pushfatal: You are not currently on a branch.To push the history leading to the current (detached HEAD)state now, use
    git push origin HEAD:<name-of-remote-branch>

D:\git\GIT_TEST\dayu>git pushfatal: You are not currently on a branch.To push the history leading to the current (detached HEAD)state now, use
    git push origin HEAD:<name-of-remote-branch>

D:\git\GIT_TEST\dayu>git add .
D:\git\GIT_TEST\dayu>git commit -m "大余提交"[detached HEAD f7fccfc] 大余提交 81 files changed, 2418 insertions(+), 14 deletions(-) create mode 100644 .idea/dayu.iml create mode 100644 .idea/uiDesigner.xml create mode 100644 a.txt create mode 100644 dayu.iml create mode 100644 md create mode 100644 src/main/java/com/coins/KCB.java create mode 100644 src/main/java/com/coins/Person.java create mode 100644 src/main/java/com/coins/aaa.java create mode 100644 src/main/java/com/coins/coin.java create mode 100644 src/main/java/com/dayu/Clock.java create mode 100644 src/main/java/com/dayu/DayuApplication.java create mode 100644 src/main/java/com/dayu/Display.java create mode 100644 src/main/java/com/dayu/Main.java create mode 100644 src/main/java/com/dayu/Student.java create mode 100644 src/main/java/com/dayu/fanmai.java create mode 100644 src/main/java/com/dayu/rongqi.java create mode 100644 src/main/java/com/dayu/wu.java create mode 100644 src/main/java/com/dayu/wula.java create mode 100644 src/main/java/com/ershiti/demo1/Student.java create mode 100644 src/main/java/com/erti/Demo3/demo13.java create mode 100644 src/main/java/com/erti/Demo3/demo13Test.java create mode 100644 src/main/java/com/erti/demo1/Person.java create mode 100644 src/main/java/com/erti/demo1/Student.java create mode 100644 src/main/java/com/erti/demo10/MyArray.java create mode 100644 src/main/java/com/erti/demo10/Test.java create mode 100644 src/main/java/com/erti/demo5/test.java create mode 100644 src/main/java/com/erti/demo5/yi.java create mode 100644 src/main/java/com/erti/demo6.java create mode 100644 src/main/java/com/erti/demo8/Compute.java create mode 100644 src/main/java/com/erti/demo8/Student.java create mode 100644 src/main/java/com/erti/demo8/Test.java create mode 100644 src/main/java/com/erti/demo9/Dic.java create mode 100644 src/main/java/com/erti/demo9/DicItem.java create mode 100644 src/main/java/com/erti/demo9/Test.java create mode 100644 src/main/java/com/shiti/demo1/A.java create mode 100644 src/main/java/com/shiti/demo1/Animal.java create mode 100644 src/main/java/com/shiti/demo1/Bird.java create mode 100644 src/main/java/com/shiti/demo1/test.java create mode 100644 src/main/java/com/shiti/demo10/Cat.java create mode 100644 src/main/java/com/shiti/demo10/Dog.java create mode 100644 src/main/java/com/shiti/demo10/test.java create mode 100644 src/main/java/com/shiti/demo2/Animal.java create mode 100644 src/main/java/com/shiti/demo2/Cat.java create mode 100644 src/main/java/com/shiti/demo2/Dog.java create mode 100644 src/main/java/com/shiti/demo2/test.java create mode 100644 src/main/java/com/shiti/demo3/Computer.java create mode 100644 src/main/java/com/shiti/demo3/Flash.java create mode 100644 src/main/java/com/shiti/demo3/Print.java create mode 100644 src/main/java/com/shiti/demo3/USB.java create mode 100644 src/main/java/com/shiti/demo3/test.java create mode 100644 src/main/java/com/shiti/demo4/Car.java create mode 100644 src/main/java/com/shiti/demo4/SportsCar.java create mode 100644 src/main/java/com/shiti/demo4/test.java create mode 100644 src/main/java/com/shiti/demo5/Flower.java create mode 100644 src/main/java/com/shiti/demo5/test.java create mode 100644 src/main/java/com/shiti/demo6/Person.java create mode 100644 src/main/java/com/shiti/demo7/Phone.java create mode 100644 src/main/java/com/shiti/demo8/Girlfriend.java create mode 100644 src/main/java/com/shiti/demo9/Coder.java create mode 100644 src/main/java/com/shiti/demo9/Manager.java create mode 100644 src/main/java/com/shiti/demo9/test.java create mode 100644 src/main/java/com/ti/demo1.java create mode 100644 src/main/java/com/ti/demo10.java create mode 100644 src/main/java/com/ti/demo2.java create mode 100644 src/main/java/com/ti/demo3.java create mode 100644 src/main/java/com/ti/demo4.java create mode 100644 src/main/java/com/ti/demo5/Keeper.java create mode 100644 src/main/java/com/ti/demo5/Manager.java create mode 100644 src/main/java/com/ti/demo5/Trainer.java create mode 100644 src/main/java/com/ti/demo5/test.java create mode 100644 src/main/java/com/ti/demo6/Animal.java create mode 100644 src/main/java/com/ti/demo6/AnimalTest.java create mode 100644 src/main/java/com/ti/demo6/Cat.java create mode 100644 src/main/java/com/ti/demo7.java create mode 100644 src/main/java/com/ti/demo8.java create mode 100644 src/main/java/com/ti/demo9.java create mode 100644 target/classes/META-INF/dayu.kotlin_module
D:\git\GIT_TEST\dayu>git push -u origin dayuTotal 0 (delta 0), reused 0 (delta 0), pack-reused 0remote: Powered by GITEE.COM [GNK-6.3]remote: Create a pull request for 'dayu' on Gitee by visiting:remote:     https://gitee.com/yuzong_1/wula/pull/new/yuzong_1:dayu...yuzong_1:masterTo https://gitee.com/yuzong_1/wula.git * [new branch]      dayu -> dayubranch 'dayu' set up to track 'origin/dayu'.
D:\git\GIT_TEST\dayu>git add .
D:\git\GIT_TEST\dayu>git commit -m "dayu大余提交"interactive rebase in progress; onto 840d11cLast command done (1 command done):   pick 8697b20 大余提交No commands remaining.You are currently editing a commit while rebasing branch 'master' on '840d11c'.  (use "git commit --amend" to amend the current commit)  (use "git rebase --continue" once you are satisfied with your changes)
nothing to commit, working tree clean
D:\git\GIT_TEST\dayu>git push -u origin dayuEverything up-to-datebranch 'dayu' set up to track 'origin/dayu'.
D:\git\GIT_TEST\dayu>git pushfatal: You are not currently on a branch.To push the history leading to the current (detached HEAD)state now, use
    git push origin HEAD:<name-of-remote-branch>

D:\git\GIT_TEST\dayu>git add .
D:\git\GIT_TEST\dayu>git commit -m "小余提交"On branch xiaoyuLast command done (1 command done):   pick 8697b20 大余提交No commands remaining.You are currently editing a commit while rebasing branch 'master' on '840d11c'.  (use "git commit --amend" to amend the current commit)  (use "git rebase --continue" once you are satisfied with your changes)
nothing to commit, working tree clean
D:\git\GIT_TEST\dayu>git push -u origin xiaoyuEnumerating objects: 126, done.Counting objects: 100% (126/126), done.Delta compression using up to 4 threadsCompressing objects: 100% (104/104), done.Writing objects: 100% (116/116), 26.23 KiB | 1.38 MiB/s, done.Total 116 (delta 10), reused 0 (delta 0), pack-reused 0remote: Resolving deltas: 100% (10/10), completed with 5 local objects.remote: Powered by GITEE.COM [GNK-6.3]remote: Create a pull request for 'xiaoyu' on Gitee by visiting:remote:     https://gitee.com/yuzong_1/wula/pull/new/yuzong_1:xiaoyu...yuzong_1:masterTo https://gitee.com/yuzong_1/wula.git * [new branch]      xiaoyu -> xiaoyubranch 'xiaoyu' set up to track 'origin/xiaoyu'.

标签:集成,main,GIT,java,create,mode,100644,IDE,com
来源: https://www.cnblogs.com/yuzong/p/16412568.html

本站声明: 1. iCode9 技术分享网(下文简称本站)提供的所有内容,仅供技术学习、探讨和分享;
2. 关于本站的所有留言、评论、转载及引用,纯属内容发起人的个人观点,与本站观点和立场无关;
3. 关于本站的所有言论和文字,纯属内容发起人的个人观点,与本站观点和立场无关;
4. 本站文章均是网友提供,不完全保证技术分享内容的完整性、准确性、时效性、风险性和版权归属;如您发现该文章侵犯了您的权益,可联系我们第一时间进行删除;
5. 本站为非盈利性的个人网站,所有内容不会用来进行牟利,也不会利用任何形式的广告来间接获益,纯粹是为了广大技术爱好者提供技术内容和技术思想的分享性交流网站。

专注分享技术,共同学习,共同进步。侵权联系[81616952@qq.com]

Copyright (C)ICode9.com, All Rights Reserved.

ICode9版权所有