Loading...
 

Merging branches in Git

Some notes regarding merging branches in Git, so far using PhpStorm (command line version to follow)

  • Clone the main Tiki repository from https://gitlab.com/tikiwiki/tiki.git
    Screenshot 2020 03 25 At 14.34.04
    This is the big one, over 3GB and will take a while
  • Check out master using the "Git Branches" menu at the bottom right of the main window
    Screenshot 2020 03 25 At 14.38.58
  • Then select "Merge into Current" on the origin/21.x branch (in this case)
    Screenshot 2020 03 25 At 14.40.10
  • Then push the merged commits back to origin (gitlab.com/tikiwiki/tiki.git)
    Screenshot 2020 03 25 At 14.43.51
  • If you get this warning dialog there have been changes to master since you last updated, so chose Rebase which will insert the changes from the origin before the merge you are doing
    Screenshot 2020 03 25 At 14.48.34
  • If there are any conflicts you will see something like this
    Screenshot 2020 03 25 At 14.52.45
  • Click Merge... and you will see the merge editor
    Screenshot 2020 03 25 At 14.54.29
    Click the "Apply non-conflicting changes: All" in the top toolbar
  • Sometimes that's enough to do it, as in this case, but if the conflict is more complicated you will need to resolve it manually, see this page for more details
    When all is well this message should appear allowing you to apply the changes
    Screenshot 2020 03 25 At 14.55.50


In this instance the rebasing part didn't seem to go totally smoothly, so i have to update the project again, and then push a second time and it worked as expected.

Keywords

The following is a list of keywords that should serve as hubs for navigation within the Tiki development and should correspond to documentation keywords.

Each feature in Tiki has a wiki page which regroups all the bugs, requests for enhancements, etc. It is somewhat a form of wiki-based project management. You can also express your interest in a feature by adding it to your profile. You can also try out the Dynamic filter.

Accessibility (WAI & 508)
Accounting
Administration
Ajax
Articles & Submissions
Backlinks
Banner
Batch
BigBlueButton audio/video/chat/screensharing
Blog
Bookmark
Browser Compatibility
Calendar
Category
Chat
Comment
Communication Center
Consistency
Contacts Address book
Contact us
Content template
Contribution
Cookie
Copyright
Credits
Custom Home (and Group Home Page)
Database MySQL - MyISAM
Database MySQL - InnoDB
Date and Time
Debugger Console
Diagram
Directory (of hyperlinks)
Documentation link from Tiki to doc.tiki.org (Help System)
Docs
DogFood
Draw -superseded by Diagram
Dynamic Content
Preferences
Dynamic Variable
External Authentication
FAQ
Featured links
Feeds (RSS)
File Gallery
Forum
Friendship Network (Community)
Gantt
Group
Groupmail
Help
History
Hotword
HTML Page
i18n (Multilingual, l10n, Babelfish)
Image Gallery
Import-Export
Install
Integrator
Interoperability
Inter-User Messages
InterTiki
jQuery
Kaltura video management
Karma
Live Support
Logs (system & action)
Lost edit protection
Mail-in
Map
Menu
Meta Tag
Missing features
Visual Mapping
Mobile
Mods
Modules
MultiTiki
MyTiki
Newsletter
Notepad
OS independence (Non-Linux, Windows/IIS, Mac, BSD)
Organic Groups (Self-managed Teams)
Packages
Payment
PDF
Performance Speed / Load / Compression / Cache
Permission
Poll
Profiles
Quiz
Rating
Realname
Report
Revision Approval
Scheduler
Score
Search engine optimization (SEO)
Search
Security
Semantic links
Share
Shopping Cart
Shoutbox
Site Identity
Slideshow
Smarty Template
Social Networking
Spam protection (Anti-bot CATPCHA)
Spellcheck
Spreadsheet
Staging and Approval
Stats
Survey
Syntax Highlighter (Codemirror)
Tablesorter
Tags
Task
Tell a Friend
Terms and Conditions
Theme
TikiTests
Timesheet
Token Access
Toolbar (Quicktags)
Tours
Trackers
TRIM
User Administration
User Files
User Menu
Watch
Webmail and Groupmail
WebServices
Wiki History, page rename, etc
Wiki plugins extends basic syntax
Wiki syntax text area, parser, etc
Wiki structure (book and table of content)
Workspace and perspectives
WYSIWTSN
WYSIWYCA
WYSIWYG
XMLRPC
XMPP




Useful Tools