Skip to content

Latest commit

 

History

History
15 lines (10 loc) · 486 Bytes

README.md

File metadata and controls

15 lines (10 loc) · 486 Bytes

conflict repo

This repo contains 3 branches:

  • master: the main branch
  • feature1: the codes contains the feature 1, from master
  • feature2: the codes contains the feature 2, from master

What you should do

  1. merge the feature1 and feature2 branches into master.
  2. change the commit message from ":harmmer: ...." into ":hammer: ....." of the commit 47fcdc014a140e7164d69fef5448cdd491198fa3
  3. run command: make.

If no error occurs, you have done the task successfully.