User Tag List

Page 1 of 2 1 2 LastLast
Results 1 to 7 of 10

Thread: Transmog Script Rochet2

  1. #1
    Emulation Addict
    Join Date
    Jun 2016
    Posts
    60
    XP
    1,048
    Level
    8
    Thanks
    0
    Thanked 6 Times in 4 Posts

    Transmog Script Rochet2

    Hello Guys when i`ve Trying to Git pull files i getting that Error a when i pulling how i can fix it that, issue

    https://s32.postimg.org/5d7d2tvk5/Transmog.png

  2. #2
    Moderator / Eluna Dev <span style='color: #FF0000'><span class='glow_8B0000'>Rochet2</span></span>'s Avatar
    Join Date
    Apr 2013
    Location
    Finland
    Posts
    1,860
    XP
    13,531
    Level
    35
    Thanks
    95
    Thanked 592 Times in 419 Posts
    do what the error says.
    commit your local changes or stash them.

    Once you get the pull to succeed you should pop your stash and fix the merge conflicts if you stashed your changes.
    Or if you committed your changes then after the pull you should fix the conflicts if any and commit the merge with git commit
    Last edited by Rochet2; 07-17-2016 at 02:35 PM.
    Awards:
    Support LOL Scripter Facepalm! Raffle Winner
    rochet2.github.io - Home of great codes

  3. #3
    Original Poster
    Emulation Addict
    Join Date
    Jun 2016
    Posts
    60
    XP
    1,048
    Level
    8
    Thanks
    0
    Thanked 6 Times in 4 Posts
    Quote Originally Posted by Rochet2 View Post
    do what the error says.
    commit your local changes or stash them.

    Once you get the pull to succeed you should pop your stash and fix the merge conflicts if you stashed your changes.
    Or if you committed your changes then after the pull you should fix the conflicts if any and commit the merge with git commit
    Can show me it on teamviewer, if your glad to help me ili be happy :)

  4. #4
    Moderator / Eluna Dev <span style='color: #FF0000'><span class='glow_8B0000'>Rochet2</span></span>'s Avatar
    Join Date
    Apr 2013
    Location
    Finland
    Posts
    1,860
    XP
    13,531
    Level
    35
    Thanks
    95
    Thanked 592 Times in 419 Posts
    No. Someone else might, but I doubt it a bit.
    Awards:
    Support LOL Scripter Facepalm! Raffle Winner
    rochet2.github.io - Home of great codes

  5. #5
    Exalted Member Syphex's Avatar
    Join Date
    Dec 2014
    Location
    Sweden GMT + 1
    Posts
    302
    XP
    169,161
    Level
    105
    Thanks
    50
    Thanked 37 Times in 29 Posts
    Try this
    git checkout HEAD^ file/to/overwrite
    git pull
    if that doesnt work try this;
    If you want remove all local changes from your working copy, simply stash them:

    git stash save --keep-index
    If you don't need them anymore, you now can drop that stash:

    git stash drop

  6. #6
    Moderator / Eluna Dev <span style='color: #FF0000'><span class='glow_8B0000'>Rochet2</span></span>'s Avatar
    Join Date
    Apr 2013
    Location
    Finland
    Posts
    1,860
    XP
    13,531
    Level
    35
    Thanks
    95
    Thanked 592 Times in 419 Posts
    You will lose stuff you have if you do what syphex says.
    So I would not suggest doing that. Unless that is what you want.
    Awards:
    Support LOL Scripter Facepalm! Raffle Winner
    rochet2.github.io - Home of great codes

  7. The Following User Says Thank You to Rochet2 For This Useful Post:


  8. #7
    Original Poster
    Emulation Addict
    Join Date
    Jun 2016
    Posts
    60
    XP
    1,048
    Level
    8
    Thanks
    0
    Thanked 6 Times in 4 Posts
    Quote Originally Posted by Rochet2 View Post
    You will lose stuff you have if you do what syphex says.
    So I would not suggest doing that. Unless that is what you want.
    hmm okey, That is last script and i will be done, if your glad to help me ili be happy Rotchet2, Really .. just Tell me what to do i`am,

Thread Information

Users Browsing this Thread

There are currently 1 users browsing this thread. (0 members and 1 guests)

Posting Permissions

  • You may not post new threads
  • You may not post replies
  • You may not post attachments
  • You may not edit your posts
  •