helar
/
Heroes_of_Hiis
1
0
Fork 0
Code Issues 8 Pull Requests 2 Projects Releases Wiki Activity

gesture_joonasp #31

Open
jonasty wants to merge 11 commits from gesture_joonasp into staging2
pull from: gesture_joonasp
merge into: helar:staging2
Conversation 0 Commits 11 Files Changed 39 +11368 -44450
jonasty commented 2022-04-25 13:08:28 +00:00
Collaborator
Copy Link
No description provided.
jonasty added 11 commits 2022-04-25 13:08:29 +00:00
This pull request has changes conflicting with the target branch.
  • Assets/_TerrainData/TerrainData_869121471408748736.asset
  • Assets/_TerrainData/TerrainMaterial_521113671563848736.mat
  • Assets/_TerrainData/TerrainMaterial_699485723238748736.mat
  • Assets/_TerrainData/TerrainMaterial_869121471408748736.mat
  • ProjectSettings/EditorBuildSettings.asset
  • Assets/_TerrainData/TerrainData_521113671563848736.asset
  • Assets/_TerrainData/TerrainData_699485723238748736.asset
You can also view command line instructions.

Step 1:

From your project repository, check out a new branch and test the changes.
git checkout -b gesture_joonasp staging2
git pull origin gesture_joonasp

Step 2:

Merge the changes and update on Gitea.
git checkout staging2
git merge --no-ff gesture_joonasp
git push origin staging2
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
Level design

   
Locomotion

   
Menu

   
NPC Mechanics

   
Player mechanics

   
bug

Something is not working

  
enhancement

New feature

No Label
Level design
Locomotion
Menu
NPC Mechanics
Player mechanics
bug
enhancement
Milestone
Clear milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
No Assignees
1 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: helar/Heroes_of_Hiis#31
No description provided.
Delete Branch "gesture_joonasp"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?